Merge: Minor fixes prompted by GCC 4.6.0 warnings.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 05:24:24 +0000 (22:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 05:24:24 +0000 (22:24 -0700)

Trivial merge